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

Merge commit '14401bf7bca34c692f248406c78bd8b49783217a'

* commit '14401bf7bca34c692f248406c78bd8b49783217a':
  Squashed commit of the following:
tree: 2268be28b510f091317a8bc54e575dd99337a65d
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/