Merge "Adjust ART tests expectations after libcore changes."