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

Change-Id: I237b05607820c6258f7f0f493857efae2452de60