Android p preview 2
Merge "mkshrc: set +o nohup."