am b78c2528: Reconcile gingerbread-plus-aosp and honeycomb

* commit 'b78c2528e1d1b7218d927c921efc9a433a478b34':