Gingerbread support-ish
John Reck authored
This reverts commit 13360629.

Change-Id: I718ec56315dc207a3e612abb4576bddab9afa2ee
37215296