Reconcile with ics-mr1-release

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