Revert "Rename module name due to duplicate"

This reverts commit 1674ea42062022452ea601537bc7e4a702882909.

Bug: 112062468
Change-Id: I1f9784508311c456b1613766b5b7ca599317684f
2 files changed