Merge "Isolate OkHttp from frameworks/base."
am: b1ccf7d392

Change-Id: Ib36953af04f4301f277bf0dfc58d8a7255f11789