Merge "Revert "Fix the ART Buildbots using the master-art manifest.""
am: 526377fe8d

* commit '526377fe8d49803654966887be08140dbed2acd8':
  Revert "Fix the ART Buildbots using the master-art manifest."