Merge "Change OkHttp test infrastructure to not use BC provider" am: 157721cd6c am: b546444591 am: 91625677b3
am: c113258c92

Change-Id: I4bdb308f319803fd6db80b4e5f46986316b249aa