Merge "build: remove LOCAL_NO_2ND_ARCH"