[automerger skipped] Merge "Merge "Update identifiers and paths to the new ART APEX." am: 0bc2361309 am: 638c078565 am: cae978e2f7 am: cf2576a56b" into qt-qpr1-dev-plus-aosp
am: bf99815ae4 -s ours
am skip reason: change_id I11000a8cc95085bb0144f858b4f3968e5aceac36 with SHA1 ef582cd242 is in history

Change-Id: I87001e6073fe45a62f4a5740d3a43b133b3f0da0