am 30497e4f: Reconcile gingerbread-plus-aosp and honeycomb

* commit '30497e4fa693b73e91bbd39c573e6ffa1d57f98f':