Merge branch 'froyo' of ssh://android-git.corp.google.com:29418/platform/build into froyo-release