am 4f5ddf03: Reconcile gingerbread-plus-aosp and honeycomb

* commit '4f5ddf036aac6dffba8194055a01957f35bc0285':