Merge "Fix ART test depending on libcore internals."
am: b4a346633a

Change-Id: I91e9afbdbc5802ab6c15f82375234833695994ca