am 3d1e6642: Merge "Don\'t build art-run-tests directly into userdata.img"

* commit '3d1e6642d350e23fa85d4cfcb03413a576880396':
  Don't build art-run-tests directly into userdata.img