Merge "Remove undefined functions from VirtualTouchpadClient." am: 622d91bf5c
am: 5fe22f0544

Change-Id: I208ab0983c0f5e1c76167f49e972c4d3fb842501