Merge remote branch 'goog/dalvik-dev' into gingerbread-release-to-dalvik-dev