Reconcile with gingerbread-release

Change-Id: I74130bf01f70959376b8453e0288c4436cdbec2b
tree: 57fd90c22e29f54003caf40bc0ed3951b099a893
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/