Merge commit 'd40d6bb6158696265df2ea31f328ffe97aff6af3' into honeycomb-release-to-dalvik-dev