Minor changes for Android Studio 1.0.1 and Snapchat 8.1.0 building.