Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)

Also revert all dependent changes:
This reverts commit 8e18668d.
This reverts commit 69b4587b.
This reverts commit a9c9a4ba.
This reverts commit 2c0042b6.
This reverts commit f6c82067.
This reverts commit 24855c09.

Change-Id: I33e699640f3f59e42fa03c99a9a1b7af0d27d4d8