Append subdirectory for concerned platforms
Make lazy_load method aware of subdirectory field
Remove platform check in platform add and update
Update parsers to match new libDir returned by lazy_load
Update tests to match improvements
fix merge conflicts
Merge pull request #2 from purplecabbage/CB-5392

Cb 5392
fixed failing tests recently introduced with Windows8 parser changes
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-cli
added win-test to be run on windows, which does not include e2e tests which have multiple failures on windows.
skip hooker.spec expects if running on win32. until someone fixes these tests, they are simply skipped over.