Merge "ART: Clean up instruction_set.h"