Merge "Fix the ART Buildbots using the master-art manifest."
am: a2964d5ab5

* commit 'a2964d5ab5c1a7158a15bb899bc99d59236b3ac5':
  Fix the ART Buildbots using the master-art manifest.