Unified dependencies, versions, style, and clean-up

Change-Id: Iac2601364bf23b7f2d167ef62adaa286e0f4c2b4