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

Change-Id: Ie23fe137a0cc6df2be34c1c57bb550631654d61b