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

Change-Id: Icc52afe2baab268e8acc362787b2e13aa0349485