Merge \\"Adjust ART tests expectations after libcore changes.\\" am: 7caad2a084
am: f44e3d662a

Change-Id: I7b28ce4b8111d19db941d9fdee349b09efde15ca