Merge "init: ignore ENOENT from fewer builtins"
am: e269a721dc

Change-Id: I884f8bb2ab23950e24e345b55afe3f7a00b37aff