Merge "Fixes to allow test-art-host to run via build server"