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

Change-Id: Iea53eaf8a6cda4c546894dd7be8091f14b1492a1