Reconcile gingerbread-plus-aosp and honeycomb

Change-Id: I048900235e7de3f5be0f0ede44cd6793874cf18f