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