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

Change-Id: I6c4e89c9b0ce39669ca6914cc134e28f005e4d55