am bab4283a: Merge "Fix x86 type conversions. test-art-host-oat passes." into ics-mr1-plus-art

* commit 'bab4283a7a5fa8f739258d6ba4e109f42c31a6a3':
  Fix x86 type conversions. test-art-host-oat passes.
tree: 435662dc960e1b4a1c651b17b8fd8c57d0234298
  1. build/
  2. jdwpspy/
  3. src/
  4. test/
  5. tools/
  6. .gitignore
  7. Android.mk