Reconcile with ics-mr1-release

Change-Id: Ie242914fa4cfdf35675bbd2777f0817186860526
tree: 0ddf435e065f725aebbd1a726eb1087f6e5decfb
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/