Merge "Fix host build to properly build x86." into ics-mr1-plus-art
tree: c49d6fbf57fb04f24452280cc7444b1aeb95d1e0
  1. build/
  2. jdwpspy/
  3. src/
  4. test/
  5. tools/
  6. .gitignore
  7. Android.mk