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

* commit 'bc7680c4d7a94cfafcc3c925f0fbf134bc1dfcb8':
  Include the okhttp.jar when compiling against internal classes