Merge: Minor tweaks and fixes for Android
authorJean Privat <jean@pryen.org>
Thu, 25 Feb 2016 14:02:13 +0000 (09:02 -0500)
committerJean Privat <jean@pryen.org>
Thu, 25 Feb 2016 14:02:13 +0000 (09:02 -0500)
Pull-Request: #1957
Reviewed-by: Jean Privat <jean@pryen.org>


Trivial merge