Merge "Rename module artifacts" into rvc-dev am: c6223a580a am: a4b91f52e4

Change-Id: Ic1f007f24b10b419c3d020f5656602d83e20be02