Merge "Run all 'compiler' variants by default." am: f83f3f6ecb
am: ac468efdc3

Change-Id: I2dcfa6fd030b2fad5136cfeeedcf358cb1b4df9f