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

Change-Id: Ie79d45d684f75ee7af865d4cda6280f606a86b7b