Merge "Enable multilib odex only if TARGET_2ND_ARCH is defined."