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