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

Change-Id: Ib6bb2fe2a92f51766dcef144db7643613dacbb3d