Reconcile gingerbread-plus-aosp and honeycomb

Change-Id: I0310c299ff4719e454488eafcebbd16045c7e9ea