Merge "Update path to the new ART APEX." am: 3f06c554cf am: 8f236929a4 am: 5cc2a9fe37
am: 2baaff557d

Change-Id: I947fc0135878953cc3e570e88e7c727a30a6f370