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

Change-Id: I2bb0af09714a31bdce8e7f2ecec66bc7c552999a