Merge "Support kernel modules in vendor, recovery images" am: 2f6c2b44d0
am: 8fafc4a830

Change-Id: I9f76060dc6465ee6d111214a534b45ebc8aa2e4e