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

Change-Id: Ib08acc8676e4af904b7efd8a77cce40dc5b5b218