Merge "Update to use nativehelper/JNIPlatformHelp.h" into rvc-dev-plus-aosp