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