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

Change-Id: I8b5d9942f8c88cb291a55b794c4f4dbfce2b4686