Merge "updater: Fix an off-by-1 bug in file_getprop()." am: da2b34b5d0 am: 917be35f0f
am: 4098285e8c

Change-Id: I0fa36336948867b75dc8226244ee25ba8e6987e0