Reconcile gingerbread-plus-aosp and honeycomb

Change-Id: Ia3c640aac588937979c2adf597f692e95a239819