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

Change-Id: I4d3829abd9f56ff7c430035fec8ad562ad6b7768