Reconcile with ics-mr1-release

Change-Id: Ib022135d56532756d171af770d4fae4e94402d9b
tree: 17482eaf257fe07bf909a9726ae86f56b4037d48
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/