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

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