Reconcile with ics-mr1-release

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