Fixing build to the new Android SDK version requirements