Merge "Revert "Remove the implementation of libaapt2_jni in build file""