[automerger skipped] Merge "Rename module dist files" am: b098442b7b am: 1af24fa462 -s ours
am skip reason: Change-Id I076f30931bf2524d57703873cd7de25b3f23b457 with SHA-1 d7f1fabc94 is in history
Change-Id: Ie67a1180c321df3033c93e1081a650a954582eee
This commit is contained in: