Merge "Migrate khrplatform.h to ndk_headers." am: a0d616be74 am: fea2cbbe39 am: 939621c380
am: 353eeaa967

Change-Id: I73b638cf2a2ba1d1b847edb4888b9c1f4dfc047f