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

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