am 3c782246: am b1d2b51c: am 761636f3: Merge "Do not force all command-line apps to be 32-bit only"

* commit '3c782246d5ee9869f2167a00df748eac1b9e9153':
  Do not force all command-line apps to be 32-bit only