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

Change-Id: I97a1ea99d26071e8627d994f06fdb46dc140a889