Merge "Tweak module_libs stub build rules"