Merge "Select the arch_variant_cflags for the 2nd arch."