Merge "Revert "Build dex2oatd with compile_multilib: both.""
am: 7a19f650b5

Change-Id: I624c6a0877dc8f4937e512602060e4d2f6a3341e