Merge branch 'use_switchroot'

diff --cc cmdline.cc
Simple merge

diff --cc config.cc
Simple merge

diff --cc config.proto
Simple merge

diff --cc nsjail.h
Simple merge