Merge "Command-line flag to disable signing with APK Signature Scheme v2." am: 3cc3605010
am: aafc1e9665

* commit 'aafc1e9665a3392891d54a22da8a5b7b292cfddb':
  Command-line flag to disable signing with APK Signature Scheme v2.