Bug: 68337468 Breaks HOST_PREFER_32BIT=true This reverts commit 617016a6. Change-Id: Ifb20f41cdf93dbfd73a3aac5b055e595e334350b