Merge "Move instruction_set_ to CompilerOptions."
am: f07d561777

Change-Id: I901faae4b853b606cca19cb16b8ebcf23b1fdac4