am ec06144c: am 36edb202: Merge "Make DRM libraries optional"

Merge commit 'ec06144c9ddd5eb06ab77b885bc5312e74b38415'

* commit 'ec06144c9ddd5eb06ab77b885bc5312e74b38415':
  Make DRM libraries optional
tree: bfee5d8b247e3b80d0bbdad5fbeda7933622b8ea
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/