Merge "Revert^2 "Remove ART APEX from the bootstrap apexes""