Merge "Remove BufferNode in libbufferhubd"