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

Change-Id: I7b071ae65bd41b4dead0dc2533cd611dd729504a