Merge "Remove more libcore classes from light grey/vendor lists" am: bb58511bcb
am: 00b65127e2

Change-Id: I7274a116749230bca5e7b1bcb2ea994ff043a5eb