Merge "Default CIRROS_ARCH to host arch"