Merge "Doc change: restructuring changes for building and running section of dev guide"