resolved conflicts for merge of 1cbf8493 to master

Change-Id: Ifea2ba8b02ecf291fbd1612973647a95a70511c4
tree: a04ba9e24b5c05daf369eef0adcc5929195246d2
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/