Updating gradle related items to get this working with Android Studio Beta
Merge branch 'master' of https://github.com/googlecast/CastCompanionLibrary-android

# By anaddaf
# Via anaddaf
* 'master' of https://github.com/googlecast/CastCompanionLibrary-android:
  Updating gradle related items to get this working with Android Studio Beta