Merge "Update path to the new ART APEX." am: 3f06c554cf
am: 8f236929a4

Change-Id: I21a62ab4ce0dd91ff3d59de8856100a42069e90f