Merge changes from topic "am-8a097a00a97a4a42bb719679fed38ec2"

* changes:
  [automerger skipped] Merge "Update to use nativehelper/JNIPlatformHelp.h" into rvc-dev-plus-aosp am: 3e10c511 am: a0be056b am: 3fb01067 -s ours
  [automerger skipped] Merge "Sync with libnativehelper refactoring" into rvc-dev-plus-aosp am: 4736a94d am: b14c4625 am: 5730c721 -s ours