Merge "Check for errors in dup2"
am: b1166633b6

Change-Id: I1b0144fbf19892012baebe08bbaab9f7e77bf71e