Merge "Revert "aapt2_jni: use proper nativehelper headers"" into stage-aosp-master