Reconcile gingerbread-plus-aosp and honeycomb

Change-Id: Ieebdf58d5e72d1f2903aaacbbd1940636a21975e