Merge "Merge "Cleanup performDexOpt with instruction sets." into nyc-dev am: 89f4bff149 am: ff078da846" into nyc-mr1-dev-plus-aosp