Merge "Merge "Remove java.... libcore classes from light grey/vendor lists" am: cd480214 am: 4becd4b2 am: 6dfb6152"