Reconcile with ics-factoryrom-release

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