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

Change-Id: I7ed6b1cd6c68fa37da827872bf4b8b07da10b805