Merge "Update DexFile#getDexOptNeeded usages to reflect API change"