Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-master
tree: 3bd345750b7153fd14720f5379ac68840832ff62
  1. src/
  2. Android.mk
  3. MODULE_LICENSE_BSD_LIKE
  4. VERSION