Merge "Tweak module_libs stub build rules" am: a659cb4a0b am: ecf5e6718d

Change-Id: I4b873d54481cd1dbeb4d24c3014ef4a7fd4f72ef