Merge "Use arch specific flags to fix multilib build."