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

Change-Id: Ic24d345a21b7e3305c9519e1670f70ba3b92f57b