am 977e0cb4: Reconcile gingerbread-plus-aosp and honeycomb

* commit '977e0cb4d378368a655b39157161218f0ce5c078':