Merge "Make cst-device-info to compile with new vkjson"