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

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

Change-Id: Icb1701880a1ef298c27a82c2c5460429300dd27e