Merge branch 'dalvik-dev' of https://googleplex-android.googlesource.com/a/platform/art into fixes-for-art-build-with-mr2

Change-Id: Ie46d1f77f98b8a6f55f02b8614cb88b36b6a2d44
tree: 2bfd05752781815306c115e40aab2b5fef10dfd0
  1. build/
  2. jdwpspy/
  3. src/
  4. test/
  5. tools/
  6. .gitignore
  7. Android.mk