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

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