Merge "Fix ART test depending on libcore internals."