Reconcile gingerbread-plus-aosp and honeycomb

Change-Id: I7ca5acfee971105e3f3d6a674f82da0e890b0434
tree: f4e291e8f0be048c70bfa6713c2dfd1ffd3b7e02
  1. core/
  2. services/