[automerger skipped] Merge "Update to use nativehelper/JNIPlatformHelp.h" am: fb07ccbe am: 1ce011e2 -s ours am: 7d070e76 -s ours

am skip reason: Change-Id Ic174c63462da4613857c30e92739b5781dcda753 with SHA-1 a56e2dda is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1348765

Change-Id: If407d8f4f82a4f7c028468eaa0939cbd10ff5c07