am 55ed56bd: Merge "Make missing DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES an error"

* commit '55ed56bd5ba912d6b91776046bee09e779c8d879':
  Make missing DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES an error