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

Change-Id: I44a3874e9737558f45e52b4f1b572b72efe16b56