Merge "Make okhttp-nojarjar visible to art sdk"