am 5270e840: Reconcile gingerbread-plus-aosp and honeycomb

* commit '5270e8408cc59774ac7cd6e2f0349fa7038bf7d0':