Merge "minadbd: track signature change of service_to_fd." am: 5ac8cfe1ed am: 959f010f7b
am: 3d59e50db5

Change-Id: I30f79a5ec7415bdd04fd4fbeb6f09972b1368140