updated to be compatible with latest Android SDK

Just some changes to make sure we can compile it with latest Android SDK tools