Revert "Remove workarounds by data_device_bins"

This reverts commit 279bf212.

Manual change:
 * Resolved conflicts in Android.bp to not change "test_suites".
 * bpfmt to silence repo upload warning

Fixes: 229948069
Fixes: 230556754
Test: TH
Change-Id: Iecccae4008c6fefd3f6ab47fb5e37ca4b22090be