Merge pull request #6784 from ricardoquesada/wp8_fixes_squash

Fixes for WP8
Fixes android build issues

also restores file for VS
Merge pull request #6785 from ricardoquesada/ooops_android_fixes

Fixes android build issues