Merge "init: handle getpeercon() errors"
am: 87882c0a00

Change-Id: Ibf1d445e800c4903bb4fb85b60015c4e3529e200