Merge "Create a full facade over okhttp"
am: a588b1faeb

Change-Id: I19667f54934fa8d2889b5ddac994a4215547e9b0