Add return code support to `pid`.
am: 4df6279c71

Change-Id: Ic853345ab244c6848349a99ec732f3b6c9ef87d8