Remove dependency on commons codec version

Change-Id: Ib5dc0e9a7dcc725cbc4a4055534c71a9cde3d63c
Merge "Remove dependency on commons codec version"