am e95d192f: Mainly fix two mistakes that I made:

Merge commit 'e95d192fae5a80ed821c53bfea214a85ea395e90' into gingerbread-plus-aosp

* commit 'e95d192fae5a80ed821c53bfea214a85ea395e90':
  Mainly fix two mistakes that I made:
tree: 3d8471d51432251efbac298239f93ef80c896f3d
  1. camera/
  2. cmds/
  3. include/
  4. media/
  5. services/