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

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