am 556d3504: Reconcile gingerbread variants

* commit '556d3504cb726e8e04e6f2aa92dd6eb7f6d18c4f':