Merge commit '94074360b9006a10a00412131c10944ce6daebda' into honeycomb-release-to-dalvik-dev