Merge "Remove getServiceProxy() on BufferHubBinderService"