Merge "Merge "Remove java.... libcore classes from light grey/vendor lists" am: cd48021499 am: 4becd4b2fa am: 6dfb615290"