am 13c7c023: (-s ours) am eb9fc27d: am 4c90a648: am 14bf45f3: Merge "Switch back to mksh as the default"

* commit '13c7c0234d4e484cc72138424a61d0f8e85eb712':
  Switch back to mksh as the default