Merge "follows the advice of -Wsign-compare" am: 1545889256 am: c1c27d597c

Original change: https://android-review.googlesource.com/c/platform/system/tools/sysprop/+/1613110

Change-Id: I884724d206a3bdbc01584320758ffdaa411ff661