Merge "libutils: remove references to unimplemented func" am: 67a0dd4e27
am: 4f8a4b095d

Change-Id: I59478690f8c6d78eea7fb9d6accc81f053c7ae5d