Fix architecture dependencies for ARM.