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

Change-Id: I0c2666a36e76c6faccbf0fb265d198c8dd77f431