Merge "ART: Clean up instruction_set.h"
am: 69462a2baa

Change-Id: I13de6df8cfa1302640279c5c136b4f4db2c264f2