Reconcile with ics-mr1-release

Change-Id: I27a7b110d3c376fd3b90b29d028b6678507955a8
tree: 85df096ae36e2226ef9344e1ac419d8ebee8c1b2
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/