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