Merge "Track moving of OkHttp facade API to new package." am: 45183fc5a7
am: 1f7fcb7970

Change-Id: I16e01dde45dd70cfb4ea43a81e728350a5b26d3f