Core: Cleaning usage of Android classes on core

This got in the code by my mistake on #1209