Merge "Isolate OkHttp from frameworks/base."