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

Change-Id: I78151d47c87fe352296233c57d87e7d317ef8c09