Revert "Remove the generated apk renaming logic."
Revert "Remove the generated apk renaming logic."

This reverts commit 678bd526055b957fa2d937fb7f54855965f2ad11.

Change-Id: Ifb5276e79d6e53dfb3a7fd2c9b3cea1985ab7aea

googlesamples/android-testdpc,googlesamples/android-testdpc