am 7121ffa5: Reconcile gingerbread-plus-aosp and honeycomb

* commit '7121ffa522b7aac155800643bb5a4298f2125358':