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

Change-Id: I56cde253edc07dff1bebb2c6ba0dc972bd562bc9