Merge "libdrmclearkeyplugin is linked against libstagefright_foundation_vendor" into oc-dr1-dev
am: 95fb5344d4

Change-Id: If71e90594b9e52f12e58205a976454b319075aa8