Revert "[TEMP?] Revert "Extensive and thoughtful modifications to vendor_module_check""

Wups.

This reverts commit 9e308f3ea1004f08f18eabdc68722e928bfbb8ed.

Change-Id: I955c884fc4224ae4942bb90a1cf549f4fdac41e7
Merge "Revert "[TEMP?] Revert "Extensive and thoughtful modifications to vendor_module_check""" into L5