Android 2.3.1 release 1
Merge branch 'gingerbread' into gingerbread-release