Merge "Revert "Added JNI interface for aapt2.""