Merge "Enable ProcessManagerTest#testCloseNonStandardFds"
am: 7c9b739de0

Change-Id: Ia93ede443968baae52e0770c2f3e94ee79c639d1