Merge "Remove com.android.bouncycastle.... classes from light grey list"