Reconcile gingerbread-plus-aosp and honeycomb

Change-Id: I68d6b90c32d5c9a5eba1b4fa889444fb65c347dc