Merge "Merge "Update path to the new ART APEX." am: 0a4cf715 am: ca19446d am: b4c1396c am: 9b1711dd" into qt-qpr1-dev-plus-aosp