Reconcile with ics-mr1-release

Change-Id: I00b8d5eecea650df527aa3c21bb4a7270a196401
tree: 0c7af0196b7825ef755512254220874186af4d1b
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/