Merge commit '8b9bc8330f90699d027045001389c69f35c55877' into honeycomb-release-to-dalvik-dev