Resolution of issues found in cross platform testing

This fixes an error introduced with the prior commit, and introduces an inelegant but needed os detection block into the __build_command__ function.  This has been tested on Mac OSX 10.9 and Windows 7, with adb 1.0.31.