Reconcile with ics-mr1-release

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