am 4c90a648: am 14bf45f3: Merge "Switch back to mksh as the default"

* commit '4c90a648cd0e1310d4b934c54905af3cf40b2770':
  Switch back to mksh as the default