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

Change-Id: I9a6cfc23f70f4a5fd836cb040324e8ef2022b6a2