Reconcile with ics-mr1-release

Change-Id: I96fd9c00680c7ff0e5c9fba04f8c08a31cf1cfa8
tree: 9923d2dba8b8bf93adb3e4a54aa8788031f6c75b
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/