reconcile open-source froyo into google variant

Change-Id: I2dcb50be9b2061fb90a10d40e430294233cc5039