am 29dbef28: Merge "Fix build to rebuild tests correctly, and disable pre-dexopt." into ics-mr1-plus-art

* commit '29dbef28a9fa99d337265de1f054ba418f6bf127':
  Fix build to rebuild tests correctly, and disable pre-dexopt.
tree: f759bdca66b92c5a9dcd354baaf3ebd119ad8de5
  1. build/
  2. jdwpspy/
  3. src/
  4. test/
  5. tools/
  6. .gitignore
  7. Android.mk