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