Merge "Fix non-{arm, x86} builds."