Merge "Tweak module_libs stub build rules" am: a659cb4a0b

Change-Id: Ic5d705635a06ef8b735187b2d3aa33be2d2ce9ec