Merge "Update identifiers and paths to the new ART APEX."