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

Change-Id: I927e0459da776d79fe13fb54a7d626be3d279272