am 3246d88d: resolved conflicts for merge of e8bb5c3a to klp-modular-dev-plus-aosp
am 3246d88d: resolved conflicts for merge of e8bb5c3a to klp-modular-dev-plus-aosp

* commit '3246d88d6c71cceec967241337f9da33e1b12d02':
  Amend 64 bit blacklist.

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