Resource changes for new Android Studio Upgrade.