am a8355eca: am 64f3a191: Merge "Multilib support for odex"

* commit 'a8355ecaadf9a0d052165d0cc14564927eb9a202':
  Multilib support for odex