am 39a5bba4: Merge "disable Krait for Mac builds to avoid assembler issues"
am 39a5bba4: Merge "disable Krait for Mac builds to avoid assembler issues"

* commit '39a5bba4726016b1d92c181cb464bfb0ffabab22':
  disable Krait for Mac builds to avoid assembler issues

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build