Merge "AAPT2: Error reporting through JNI." into oc-dev
am: f49baef4b9

Change-Id: I7dab9ad1acb5cdfedd9f68d15f6a49c63e638aae