Merge "Remove libpac usage from Android."