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

Change-Id: I659219ee179aac1d43e74dcdecde46c073c89436