Merge "ndk: remove obsolete <android/api-level.h> headers"