Merge "Remove libpac as a JNI library in Android.mk"