[automerger skipped] Merge "Remove more libcore classes from light grey/vendor lists" am: bb58511bcb am: 00b65127e2
am: 2b84af299e  -s ours

Change-Id: Ie6d3372aac5df784436df083156f6f0ddc9ea975