am f29d90b4: Reconcile gingerbread-plus-aosp and honeycomb

* commit 'f29d90b44fbff72d3deb94e984bd901c29534b1b':