Merge "Update GetDexOptNeeded to handle the different levels of compilation" into nyc-dev