Merge "Cleanup performDexOpt with instruction sets." into nyc-dev