Use Gemfile-common, fix rubocop failures

Change-Id: Ifa9268c65164214fe39bc64ebf57d76c8366d667