Fix handling of MTP fork/child process

Change-Id: Iacd8a38d21e9c8b0dfafefbeb646f46cd3ba02a1