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

Change-Id: Ic4758d4aabdd40012e1e1e75755812bce722f3c8