am d1398db3: Merge "Squashed commit of the following:" into gingerbread

Merge commit 'd1398db35cb2e4d918fc631dda35cacb8540b187' into gingerbread-plus-aosp

* commit 'd1398db35cb2e4d918fc631dda35cacb8540b187':
  Squashed commit of the following:
tree: 37e84bda3973a55ff84c5878d6d3911561a9d21c
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/