Revert "Upgrade project to build with latest Android Studio"

This reverts commit 0f797123703d20a4a822b6292bd1dea58cd9f525.