Merge "Add makefile + jarjar rule for okhttp."