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

* commit 'ea9917a5709fd0845a221cbae2fd8821c85f3d2f':
  Workaround for verifying large APKs.