Merge from ics-mr1

Change-Id: I209499775ddf68b380d0ec801d558e1dc86ab953
tree: 9923d2dba8b8bf93adb3e4a54aa8788031f6c75b
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/