am 3a9cc8ce: Merge "Squashed commit of the following:" into gingerbread

Merge commit '3a9cc8cef49165d6b1a1eb37b15a0ae21b0042f7' into gingerbread-plus-aosp

* commit '3a9cc8cef49165d6b1a1eb37b15a0ae21b0042f7':
  Squashed commit of the following:
tree: 611c3087db722f8f01cd04cb48de6fcba629fea6
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/