Merge commit '2e5574379e355feef79279ef6b2db0efe7c581e5' into honeycomb-release-to-dalvik-dev