Fix InnerclassSeparator lint warning, and don't cache the gradle
distribution