[automerger skipped] Merge "Merge "Update path to the new ART APEX." am: 0a4cf715f6 am: ca19446d9a am: b4c1396c5c am: 9b1711dde0" into qt-qpr1-dev-plus-aosp
am: 295e83d4e8 -s ours
am skip reason: change_id Ica35fc7f6adade19160cbb16adf5647d189ecc45 with SHA1 28f0a76486 is in history

Change-Id: Iba6238e4b248eeedc9f896c420221f04a327f6f0