Merge "Allow okhttp-norepackage to compile in master-art"