Merge commit '907121653af99cd560113e6aea6e70c00eb5e7b3' into honeycomb-release-to-dalvik-dev