Merge branch gingerbread of github.com:GingerCMX/android_bionic into gingerbread