Merge "Update identifiers and paths to the new ART APEX."
am: 0bc2361309

Change-Id: I43cc3d40c768b68e8b026a28eb39d07defb72168