Merge "Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it."