Merge "Workaround for verifying large APKs." into nyc-dev
am: 026cf53fe4

* commit '026cf53fe46a3da512088212f22a2989993eb963':
  Workaround for verifying large APKs.