Merge "Update GetDexOptNeeded to handle different levels of compilation"