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

Change-Id: Idd22c2d03d984b845313f563cc3c17eaae0ec296