Merge "Make okhttp-nojarjar visible to art sdk" am: 781dda91ba am: 7ade36b9f2 Change-Id: Ib3eb273df9be05c15a48bcba1f4fdfa4f109cfe2