Merge "Remove ART_DEFAULT_INSTRUCTION_SET_FEATURES"
am: 1106d769f4

Change-Id: I6d357ea0daa86c3ec1efd620ac9d1fccdd87b120