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

Change-Id: Ic06b577feeac9a6419b03644cd529886e0330978