Merge "Don't #define __ANDROID_NDK__ for the platform build!"