Merge "Don't call fdopendir on unique_fd::get." am: 0a34c57990 am: 61b9c33acf
am: 4615019a0a

Change-Id: I79beb058a07048cac3683954d4e3d3b74f1a9ca2