Reconcile gingerbread-plus-aosp and honeycomb

Change-Id: I32c18a45ce3403072e6f917a370f3b1a7212ae59