Merge "Don't load legacy plugins from /vendor/lib/drm" into oc-dev
am: 1de69ea178

Change-Id: I97d1e35cd7a1ab8c27da5e3ffe5d7e2cb091bf0d