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

Change-Id: If8f891253b4bef9e7264f28cdd79108c3e4d8d42