Reconcile with ics-mr1-release

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