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

Change-Id: If02ea4f12870acb3e5e1bce9e9ddbc42c0fd05f0