am bf838a66: Reconcile gingerbread-plus-aosp and honeycomb

* commit 'bf838a662e1bd2c5e4af6a9dd3c37625be020fdd':