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

Change-Id: I56784d49f6ed1e48de1f40047d28a8ba89f13579