Reconcile gingerbread-plus-aosp and honeycomb

Change-Id: Iecd9a9e7657aaca6d4fb3ec7605b40395ed5b709