Revert "Fixes MinGW build also"

This reverts commit 745bf7bfa2bb1a62507fc59261628767f0b5c9a1.
Revert "Compatibility update for API 9.70"

This reverts commit fd529f9b0c4d6aa04808b00469b2a916db687df5.
Revert "Revert "Compatibility update for API 9.70""

Making it compatible with 9.7
This reverts commit d86b0bd9ad734c8353f70c30d70c84d93ca21b40.