Reconcile with ics-mr1-release

Change-Id: Id19190393a665dd1b07c073970925758aa383691
tree: 8e3233b2ef42a094d31d6eea8befbe8daceef9e5
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/