jf: Revert back to stock csd-client library

* Partially reverts b8248f8426443da5567b12d7731964869747b115

Change-Id: I042596ca5368988c4091ec054f9071f4cf1a0355
Signed-off-by: Brandon McAnsh <brandon.mcansh@gmail.com>
Merge "jf: Revert back to stock csd-client library" into jb-mr1