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

* commit '6d0957aca1692e0878041a975672114c26b253bf':

Change-Id: I916ce4a3eac6c6e2cb6e63e46125da8a36a41823