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

Change-Id: I8a707c89ce289cc7a73aa83d2bef5de6f41b5a91