Fix some compilation errors after merge

I am planning to switch to Gradle build system to sync with Android
Studio - it's messy right now.