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

Change-Id: Ibad6883a3129c520e895684560cb5f06942e96b9