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

Change-Id: If93cbcf009d60c35d7292abfcdecfb565965dc17