am 25313cd3: am 59cc3f5d: am 5b1fa1c8: Merge "build: remove LOCAL_NO_2ND_ARCH"

* commit '25313cd32a78108945d65144399fc292350e9e0a':
  build: remove LOCAL_NO_2ND_ARCH