Merge branch 'gingerbread' of git://git.omapzoom.org/platform/bionic … …into 237 Conflicts: libc/Android.mk libthread_db/Android.mk Change-Id: I4a730f70bf3b31331ab9cee5f1a098d4162ef4b7