Merge "init: remove unused cutils includes" am: 20e43a2f2c
am: 375cc20455

Change-Id: I0d6332498f13ec6829544422ab275e9ae9e66080