[automerger skipped] Merge "Tweak module_libs stub build rules" am: a659cb4a0b am: ecf5e6718d am: e108e2696a -s ours
am skip reason: Change-Id I9f14d35ba657045e99190b7a651781a5b87d490d with SHA-1 2e2008b7a1 is in history

Change-Id: If41795e238c82c93c0f3febbda5527c0be5866c6