Merge "Update references to the new ART APEX."
am: 2d9d5e2d09

Change-Id: I61fc0d6e95e50c652127c03cd22fb60a4394e664