Merge "Remove com.android.okhttp.... classes from light grey list"
am: 669037f821

Change-Id: Ifc26fe7ea8c4d1246628c2eb66a38da13543e7a8