am af0cdef6: Merge "Fix x86 compilation of const-wide." into ics-mr1-plus-art

* commit 'af0cdef6a3ea06a4ae3fb012e4f7a9c56d661508':
  Fix x86 compilation of const-wide.
tree: 7ac403a895ae71d0b6483fdb5e0580f6a9b35821
  1. build/
  2. jdwpspy/
  3. src/
  4. test/
  5. tools/
  6. .gitignore
  7. Android.mk