Merge "Dup fds to stop finalizers from invalidating them."
am: d7a02820ac

Change-Id: Ia0aedcf2cd8d56f8a8c31b3af95ae8a2ae0dedd0