Merge "Check for errors in dup2" am: b1166633b6
am: 1d5d475b51

Change-Id: I3ec9c4291cad322921a51d34a8ced176abf43de0