Fived build script to hopefully handle new build on vs2012
Merge pull request #388 from blackberry/next-2

Fived build script to hopefully handle new build on vs2012