[automerger skipped] Merge "Revert^2: "Remove implict jni.h include path"" am:...

[automerger skipped] Merge "Revert^2: "Remove implict jni.h include path"" am: 8b1531e7 am: 15a013b8 -s ours am: bf8b66d1 -s ours am: 446f2891 -s ours

am skip reason: Change-Id I6175d7c59734ba9b6c32457e5a9b0704d49f4106 with SHA-1 92febdc8 is in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1326314

Change-Id: I43f649f2c60c89990169e998c6995a780bb5b92f