Fixes android build issues

also restores file for VS