Merge "Build dex2oatd with compile_multilib: both."
am: 181b831d1a

Change-Id: I36b1de09f2639e4274b6e4ca7f5dca85e2314ffa