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

Change-Id: I98e89a7d0e7f25dab92e278a319d502713489979