am 5b1fa1c8: Merge "build: remove LOCAL_NO_2ND_ARCH"

* commit '5b1fa1c8a05618a2c47edc628b2bafe4a9c6c50a':
  build: remove LOCAL_NO_2ND_ARCH