Merge "Support kernel modules in vendor, recovery images"