Reconcile with ics-mr1-release

Change-Id: Ie377d01065e1c34c60a97df3725e56100bae3903
tree: 9d54b94b6a9b0fcfb456ae05e21953e8ea97d9f0
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/