Fix module-file name collisions

Bazel doesn't allow a module and file with the same name.

These are some extra modules I missed in aosp/2201115

Bug: 198619163
Test: m am, verified it was still installed to out/target/product/emulator64_x86_64/system/bin/am and not am.sh
Change-Id: I763a938918854541ec5b0bcf740b1b6cf0fce771