Reconcile with ics-factoryrom-2-release

Change-Id: Idf18e15df810885a373fb4057f0db064771afc8e
tree: 495b8c8bd23d3d1114b0538aa92030a7dcf90693
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/