Reconcile with ics-mr1-release

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