Merge 0ef57993 from gingerbread

Change-Id: If10fee1ae387a8130356dd62fe678495402d5edf
tree: 39e315f0abd398d2e8d5d444fad30031468326a9
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/