Merge "Include the okhttp.jar when compiling against internal classes"