Merge "Add libaapt2_jni to SDK build"