Merge "init: use PLOG rather than strerror." am: 71c084d07e am: f09e388f95
am: c721eccf01

Change-Id: I0bcee5ef6e4bebc99cb47ff016f827e6d35421cd