Merge "Fixing gradle version comflicts" into ub-launcher3-calgary
am: fdcbe30

* commit 'fdcbe306f13c41b183689a5410dc7ba859ff1a07':
  Fixing gradle version comflicts

Change-Id: I64efc68c3c368fd24da5ffb69dd15eb1742a3fc3