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

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