Merge commit '1df986c21ee52c6756846b4a5e45cb316f772112' into gingerbread-release-to-dalvik-dev