Revert "Amend module path for short-term 6.1 branch consolidation"

This reverts commit dae06deae0a0ea26fdada91684f676030ec9921f.

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