Merge "Remove more non-NDK headers." into ndk-r14-release