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

Change-Id: Ifa14f3074ac2cb836ce950add1e27e1583d78335