[cleanup] Fix compilation errors with CheckStyle 7.6Change-Id: Ie46090ae9f010a641124fdb7501b3534d6936687Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>
[releng] Open Guava range to include version 21Change-Id: Iac7da2097c92d7dfca3a7787fda78f35c7801f4cSigned-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>