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

Change-Id: Idc23d214eeea75c60dc1d12aef77270724f95a2e