Merge "Close PFD.AutoClose{In,Out}putStream before the PFD itself." am: 8fe23dfeff am: dcf129f380
am: a355924be3

Change-Id: I9db1facad1b464715a1d8d64d9caa1ebd5d3ba43