commit 921da951ef1b7846826803ceb6485c170f23ef1d
author Victor Hsieh <victorhsieh@google.com> Thu Jun 23 09:52:54 2022 -0700
committer Victor Hsieh <victorhsieh@google.com> Tue Jun 28 19:31:54 2022 +0000
tree 182f7ae84f50a91ac48cbba037aa34aa5cabc874
parent 2d31bbe7ec07b2a0a41362a0761a8113511602cd

Reland: Remove workarounds by data_device_bins

This reverts commit 4e2e4c93379fbb53f88a09147d17caefdcf850fd, plus
replacing data_device_bins with data_device_bins_both.

Previously, the test has dirty hacks that force building the device
executable in correct name. Switch 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 3b6c701cc7b0ed470bbd32d2173de5d56d546a89)