Merge "adb: avoid sign extension of shell return code." am: b5ac15a936
am: a6397564b6

Change-Id: I6d5e70872105ef569d7a2d2b1fbb488c66adfbbe