Reconcile gingerbread-plus-aosp and honeycomb

Change-Id: I6f6c22bca861de934a539e680a256f4374dece63