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

* commit 'c1168dc4c3ce69f11f0cefe44cfec737ab254cec':
  Use ANDROID_TOOLCHAIN and ANDROID_TOOLCHAIN_2ND_ARCH in 'stack'.