Reconcile gingerbread-plus-aosp and honeycomb

Change-Id: Ibeb0a92c87bd7fddb7f8242dc0a3d1875c29c251