Addressing lint errors

Fixing trivial lint errors. Updated Gson reference
[lint] replaced empty xml body with end tag