Android 2.2.1 release 2
Merge branch 'froyo' into froyo-release