Merge "Update path to the new ART APEX."
am: 3f06c554cf

Change-Id: Ide52d2c81bdfce77ea8653a210842fcbc2c886c6