Reconcile gingerbread-plus-aosp and honeycomb

Change-Id: I7ca5acfee971105e3f3d6a674f82da0e890b0434