Merge "Migrate khrplatform.h to ndk_headers."