Reconcile with gingerbread-release

Change-Id: If7c568d850eaffbcfc237e8b875bc5684c6dc651
tree: e3ebdfbe954a3dc630ff8161eeb73c2c916302ca
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/