Merge "Better handling of various types of compilation in DexOptimizer" into nyc-dev