Merge "init: ignore ENOENT from fewer builtins" am: e269a721dc am: 82b48d2023
am: a34a71db66

Change-Id: I5882a580bdbbaea3e88c4dc7ab8e2c0727c5564e