Reconcile gingerbread-plus-aosp and honeycomb

Change-Id: I9a2855046a937e24cc16fb0fd79782d51f6adba9