Android 2.1 release 2.1s
Merge branch 'eclair' into eclair-release