WIP Fix for Android Studio issue

I'm currently working on solving #1, this is a WIP.

@rafaelfranca any thoughts on this?