Merge "AAPT2: expose return values through JNI." into oc-dev