Merge "Remove line from bad resolution merge." into oc-dev-plus-aosp

import static com.android.server.pm.InstructionSets.getDexCodeInstructionSets;

import static com.android.server.pm.PackageManagerService.WATCHDOG_TIMEOUT;

import static com.android.server.pm.PackageManagerServiceCompilerMapping.getNonProfileGuidedCompilerFilter;

import static dalvik.system.DexFile.getNonProfileGuidedCompilerFilter;

import static dalvik.system.DexFile.getSafeModeCompilerFilter;