am d820da20: Reconcile gingerbread-plus-aosp and honeycomb

* commit 'd820da20e28c0468324125a8a2bf75c3c4c01c27':