am c8fc2759: am de853fec: Merge "Fixes to allow test-art-host to run via build server"

* commit 'c8fc2759573adf63e1a5c5118e0f5503ad55f7fd':
  Fixes to allow test-art-host to run via build server