Reconcile with ics-mr1-release

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