am 221a9f3c: Merge "Fix host build to properly build x86." into ics-mr1-plus-art

* commit '221a9f3c0eb6ba8e4b58974eb2ac4e3e81580593':
  Fix host build to properly build x86.
tree: c8324b369aca4ff664849978a99233cadb7d5f5a
  1. build/
  2. jdwpspy/
  3. src/
  4. test/
  5. tools/
  6. .gitignore
  7. Android.mk