android: w,h weren't set before setup + fix deprecated constants
Merge pull request #1896 from arturoc/bugfix-androidSetup

android: w,h weren't set before setup + fix deprecated constants