Minor fixes to android-all