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