Merge "mkshrc: set +o nohup."
am: 827d6b8caf

Change-Id: Ib9ceff3b3561ae01c22f07e7e89335048eba9937