[automerger skipped] Merge "Rename module dist files" am: 2b4926b52b am: 4ca6df3226 -s ours

am skip reason: Change-Id I076f30931bf2524d57703873cd7de25b3f23b457 with SHA-1 8bf731c0fc is in history

Change-Id: Ie67a1180c321df3033c93e1081a650a954582eee