am 64f13e67: Reconcile gingerbread-plus-aosp and honeycomb

* commit '64f13e6767cd76766a5e5edd192cfcd6e71e036e':