am 5128629c: Reconcile gingerbread-plus-aosp and honeycomb

* commit '5128629cabd70ca336e471db363893d0554327e9':