[automerger skipped] Merge "Update to use nativehelper/JNIPlatformHelp.h" am: fb07ccbe9d am: 1ce011e220 -s ours am: 7d070e7632 -s ours am: 8d744e8f87 -s ours am: e3f6352b9b -s ours

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

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

Change-Id: I30b22582e1d4288a6cd08fe813b8df7ae3eeb1dd