Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.

Change-Id: I9182ce1efe09609100d19c9fae2bc4fe7358dfc0
Merge "Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it."