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

Change-Id: Ie424edb41d1f9deeb1c915fec8b680c421aed2c2