Core: Cleaning usage of Android classes on core

This got in the code by my mistake on #1209
Merge pull request #1221 from DroidPlanner/coreMinorCleanUp

Core: Cleaning usage of Android classes on core