This reverts commit 4e2e4c9337, plus
replacing data_device_bins with data_device_bins_first.
Previously, the test has dirty hacks that force building the device
executable in correct name. Swicth to the proper solution now that we
have it.
Bug: 228775576
Test: atest ApkVerityTest
Test: lunch cf_x86_64_tv-eng; atest ApkVerityTest (against cf_x86_tv VM)
Change-Id: Iccb457131d74a83b9f5cb8457833d7c5ea495b05
Merged-In: Iccb457131d74a83b9f5cb8457833d7c5ea495b05
(cherry picked from commit 3b6c701cc7)
13a0652e35