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

Change-Id: I5e1d9f4cc3c7f441e2f987b20135135f6a585540