Merge "Fix offset math for upcalls on x86" into ics-mr1-plus-art
tree: 1badbdd01fc9b5ac786ce8b35b1eae1ab5821163
  1. build/
  2. jdwpspy/
  3. src/
  4. test/
  5. tools/
  6. .gitignore
  7. Android.mk