Reconcile with gingerbread-release

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