Merge changes I2f8edd95,I17d67431

* changes:
  Allow building Android builds locally
  Allow test runner to build master-art-host targets