am d2d5c254: Merge "Do not use FindOatFileFromOatLocation in DexFile_isDexOptNeeded" into ics-mr1-plus-art

* commit 'd2d5c2546733b579f8c7f1f8dd37d3bd85478dc8':
  Do not use FindOatFileFromOatLocation in DexFile_isDexOptNeeded
tree: 2550829d9487e3c4ca49e69047c55653b4b285fc
  1. build/
  2. jdwpspy/
  3. src/
  4. test/
  5. tools/
  6. .gitignore
  7. Android.mk