am 01025db4: am d820da20: Reconcile gingerbread-plus-aosp and honeycomb

* commit '01025db4992639d453b5f70ea17efd1c189a884d':