Merge "ART: Change prebuild run-test setup" am: b5a0647
am: 9fcda11

* commit '9fcda114ca0c77b660c46dd3fbc7c0531695c69a':
  ART: Change prebuild run-test setup

Change-Id: I4169ed7e0f9665133ef75a5c4c313d26ed9b6f6b