Merge "Google login - update module to support addition into Android Studio build system." into idea133