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

Change-Id: I7dea42b2958b89c3c8c2a9708b2cc657eee6aa97