Merge "Remove dependency on libutils in native autogen"