am 36edb202: Merge "Make DRM libraries optional"

Merge commit '36edb2028acf9f876a288a49a66bc749b28e64c1' into gingerbread-plus-aosp

* commit '36edb2028acf9f876a288a49a66bc749b28e64c1':
  Make DRM libraries optional
tree: 87bd341f2e11724f2647eeafb96ab0038c47ad55
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/