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