Merge "Remove the deprecated buffer_hub_client.h"