am 04a53e2f: Merge "Use ANDROID_TOOLCHAIN and ANDROID_TOOLCHAIN_2ND_ARCH in \'stack\'."

* commit '04a53e2fd7d5331a1977a0e305b883e84a7825b9':
  Use ANDROID_TOOLCHAIN and ANDROID_TOOLCHAIN_2ND_ARCH in 'stack'.