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

* commit '8074ff4d0f962a933586b9809d1f1bdffe1fe5ed':
  Multilib support for odex