Removed "Mixed Platform" from solution (and a build fix).
Merge pull request #2173 from Benglin/master

Removed "Mixed Platform" from solution (and a build fix).