Merge "Merge "Track moving of OkHttp facade API to new package." am: 45183fc5a7 am: 1f7fcb7970" into oc-mr1-dev-plus-aosp
am: f63d128dd9

Change-Id: Ibb562280213bdaa499787c0e6cfd371c553d4f1c