Reconcile gingerbread-plus-aosp and honeycomb

Change-Id: I39eeb24bc7dc2fe2f9223e079aeccf4966d92d38