Merge \"Add runconuid command to xbin\"
am: a33edd664d

Change-Id: I7f8403cb1f355c25c46659f9e5b0261ebe302791