Merge "Fix x86 compilation of const-wide." into ics-mr1-plus-art
tree: 3b0906f06cd56fe86f657c278ecde8f349af3931
  1. build/
  2. jdwpspy/
  3. src/
  4. test/
  5. tools/
  6. .gitignore
  7. Android.mk