Fixed compile errors and removed redundant json library

Change-Id: I4a174425e78196cceef4952fea24c21d4061f10f