Merge "Fix DRM prebuilt vendor module handling" into oc-dev
am: fdfb81ebb6

Change-Id: Ib8cb9c7cca60817256c425ff4c89d60a9109ccb5