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

Change-Id: Ied0bf8a62be2dd2038adf3de2251419bf5f3e964