Merge "Remove com.android.bouncycastle.... classes from light grey list" am: cacc09018b am: c0c49cee10
am: face88cf2c

Change-Id: I34c1fada31b87535ec7396adeab84d9e54bd5de5