Reconcile gingerbread-plus-aosp and honeycomb

Change-Id: I3249b581cf8e77253f3225ac3b158019b0a75c64