Revert "Remove external gson tracking"

This reverts commit 58146fa0e92619a9686e77f7a09ddca5ab6d3b9d.