Merge "ART: Clean up instruction_set.h" am: 69462a2baa am: 4b93c6dd5c am: 08cefffb3d
am: e627c787dc

Change-Id: I275fe5c136c45695ef9b651f5a66fde12d6f1547