am f0562b4b: Merge changes I93dfc4c8,I781953d6 into gingerbread
Merge commit 'f0562b4b' into gingerbread-plus-aosp
* commit 'f0562b4b':
fix[2798925] Gingerbread TOT not booting
Revert "Revert "fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger""