Remove the -march=soandso and just pass soandso as build arg and take care of setting the -march and -mtune parameters in the Dockerfile. (cherry picked from commit fc141fee)