Revert "Only append suffixes to dex2oat(d) on host." am: b59f5fba91

Change-Id: I21052d168635257ec9a0818d7aba09bf963483d1