Merge "Remove dependency on libutils in native autogen"
am: 445a5e3836

Change-Id: I46e0458483a01a8e2b6e8f21fb825ee23938c93e