reconcile open-source froyo into google variant

Change-Id: Idfacbf98a6c98176620f252504213d01bbd49eb9