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

Change-Id: I23a527a0e9de0a27748d234b476aee85c4fe3d39