am e2004081: Reconcile gingerbread-plus-aosp and honeycomb

* commit 'e200408135d5788e094e9f3712d1729557046da8':