Reconcile gingerbread-plus-aosp and honeycomb

Change-Id: I3cbceaedf5db731a1eb8340a7644dfe97b98097b