Include Missing Commits from gingerbread-plus-aosp

These somewhat got ignored as part of (HOW!?):

Merge remote branch 'korg/froyo' into manualmerge
C-Id: Ie74c678a6ae142d9861b6965a8ca89ff58ebfa83

A lot has changed, so its not an exact cherry-pick.

Change-Id: I5347f2c15eadf59511de11cf08e16be5f66e5b0e
10 files changed