Merge "Fix the obsolete vkjson path in gpu services" into pi-dev