Reconcile with ics-mr1-release

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