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

Change-Id: I60db1b3e3df814523a623eb51055b23d4f1a7edc