Merge "Update DexFile.getDexOptNeeded in framework"