am 34afc565: am 5cc7f8a7: Merge "Select the arch_variant_cflags for the 2nd arch."
am 34afc565: am 5cc7f8a7: Merge "Select the arch_variant_cflags for the 2nd arch."

* commit '34afc565b41989f07d6e479def5e849aeaad1ac9':
  Select the arch_variant_cflags for the 2nd arch.

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