Merge "cameraserver: Wrap calls to IPCThreadState functions to factor in different transports."