Merge "Remove ART_DEFAULT_INSTRUCTION_SET_FEATURES"