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

Change-Id: Ic48c9c0063d63007078b6afb6c3b0f2f9c0c81bb