Merge "Update path to the new ART APEX." am: 0a4cf715f6
am: ca19446d9a

Change-Id: I52cb2b75f65bdcd4aa3e2d2a33bbed79159d7f27