Merge "Update zrpcd repository to build latest changes"