Merge "Don't build art-run-tests directly into userdata.img"