Reconcile with ics-mr1-release

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