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

Change-Id: Ic9b83ef13c9063f70c1d8af6ab95085f17afa4be