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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11985978

Change-Id: Ia6b5137921c169b28b7383b323c78ff795a849b8