Merge "Revert "Build dex2oatd with compile_multilib: both.""