Merge "Revert^2 "Remove the reference of libaapt2_jni in build file""