Merge "Fix PATH in bootstrap_jiri comment to match what script does"