am bee865a9: am 6af8e11f: Merge "Switch to toybox mount(1)."

* commit 'bee865a94305b580f63c57bfcb1181b973bf84e2':
  Switch to toybox mount(1).