Merged scons/scons into default
authorIbrahim Esmat <iesmat@microsoft.com>
Tue, 1 Aug 2017 01:27:52 +0000 (18:27 -0700)
committerIbrahim Esmat <iesmat@microsoft.com>
Tue, 1 Aug 2017 01:27:52 +0000 (18:27 -0700)

Trivial merge