Reconcile with ics-mr1-release

Change-Id: I1b745b11729a3fda14ffe44f1f44854e087318c7
tree: 52cb291bf974f4593277cc1142e514ebadae4b89
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/