Merge change 5014 into donut

* changes:
  Fix issue #1933587.  Perform dexopt of instrumentation .apks.