Merge "Squashed commit of the following:" into gingerbread
tree: 549c81284c9d7c4515b9e97f337321ede5d6341c
  1. camera/
  2. cmds/
  3. include/
  4. media/
  5. services/