Merge "Migrate khrplatform.h to ndk_headers." am: a0d616be74
am: fea2cbbe39

Change-Id: If4cfe4aa468e50dd12c8f0c66bdfdbca8e0bf8f5