Mr. Marshall led a little-known office that has helped shape American military thinking, and kept his focus on China even when that was out of fashion.