Merge "Added building libaapt2_jni.so."