Reconcile with ics-mr1-release

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