Fixes for commit e6c5f8cb6bd310b in android/build