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