[automerger skipped] Merge "Update path to the new ART APEX." am: 0a4cf715f6 am: ca19446d9a am: b4c1396c5c am: 9b1711dde0
am: 7a9c6e92f4 -s ours
am skip reason: change_id Ica35fc7f6adade19160cbb16adf5647d189ecc45 with SHA1 3de5cbbd1c is in history

Change-Id: I9380f70b45e8142216b44966e7e0ae1bc4a1b0c1