Merge commit '7bbd4580afe0347892a0680b5917ec7df38c003a' into gingerbread-release-to-dalvik-dev