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

* commit '87cf2b5bec19adaf418704ae3beb9f5a15f07a15':
  build: remove LOCAL_NO_2ND_ARCH