Merge pull request #836 from google/chromeos

Default to building both x86 and ARM ABIs