Reconcile with gingerbread-release honeycomb-release honeycomb-mr1-release

Change-Id: I673f0a6cc6425eadd0be9ba977be8d499f50ffda