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

Change-Id: Ic38b5d25594949241467f4271475e9f4503397b1