Merge "Remove libpac as a JNI library in Android.mk" am: 0de923935d
am: 77f1577c88

Change-Id: I75a9bb40a59787570f95289c2fcf0c698a2d46a4