Reconcile with ics-factoryrom-release

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