Merge "aapt2_jni: use proper nativehelper headers" into stage-aosp-master am: e17aa09136 am: 1c7ae6507e
am: 5c65590564

Change-Id: Ie3c13f03658a2a5ac8fae7edadb4833b86716386