Minor cleanup fixes to adk and genymotion

Removed unnecessary vars and requires.