Fixes to build on android-8 (Android 2.2).