am d2b294c7: Reconcile gingerbread-plus-aosp and honeycomb

* commit 'd2b294c7b80319d91b9105715d5b7d9156a7059c':