Merge "Check the return value of setuid(2)." am: 155d2bcb7a am: 4503269951
am: 4d7df0ffe5

Change-Id: I476fbb57e0beb524bd9d768f609a4c70ed50dcaa