Reconcile gingerbread-plus-aosp and honeycomb

Change-Id: I3363298a6562e9dec4c522055a7a8ab346904ffc