Merge commit '722baf5ec47b57020ac39ec3e2b6cd1a02c3c4db' * commit '722baf5ec47b57020ac39ec3e2b6cd1a02c3c4db': Fix issue #1933587. Perform dexopt of instrumentation .apks.
Merge commit '722baf5ec47b57020ac39ec3e2b6cd1a02c3c4db' * commit '722baf5ec47b57020ac39ec3e2b6cd1a02c3c4db': Fix issue #1933587. Perform dexopt of instrumentation .apks.