Merge "Merge "Update path to the new ART APEX." am: 0a4cf715f6 am: ca19446d9a am: b4c1396c5c am: 9b1711dde0" into qt-qpr1-dev-plus-aosp