Reconcile gingerbread-plus-aosp and honeycomb

Change-Id: Ia5cd432700452320d0a4cc81c8ea7f3669b6b422