[automerger skipped] Update paths and names for the new ART APEX. am: df96e1f25c am: bb55e0776f am: 4963265dc7 am: 7ad3e1c41d
am: 480468db4b -s ours
am skip reason: change_id Ic59b7bc8aae7ce521cf3ec9df4ab72aa611d0b75 with SHA1 d62804fe9e is in history

Change-Id: Ibb8de88ecde1fa969ea3c7ddb1fdfe4978fd95dc