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

* commit '8584b2124a400de96f8492e9c324921047753c33':