Merge "Multilib support for odex"