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

Change-Id: I0f597dac4064975777f050d7dea83cb95f55c772