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

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