Merge "Dup fds to stop finalizers from invalidating them." into nougat-mr1-cts-dev am: bfabfe75f9
am: 80c62eb79b

Change-Id: Iee5219bc701a3049340d49f4fb33cc1340325957