Amend module path for short-term 6.1 branch consolidation

Bug: 316820336
Change-Id: Id13b6ae77064fcb326212c01230887b19ab1ebda
Signed-off-by: Robin Peng <[email protected]>
14 files changed