Reconcile gingerbread-plus-aosp and honeycomb

Change-Id: I7ca5acfee971105e3f3d6a674f82da0e890b0434
tree: 699025e929ec01e6188363e025a53e02d569ad10
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/