Reconcile gingerbread-plus-aosp and honeycomb

Change-Id: I9e9ed9561b018d8629e1c50a98dff1f45d78e2cd