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