Merge "Remove unused dependency on libutils." am: 2a17f89d12 am: 7e7fd6b3b6 Change-Id: I2307a7b9a1c9430924c0640cac9daccc161826e3