Reconcile gingerbread-plus-aosp and honeycomb

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