[automerger skipped] Merge "Remove dependency on libutils in native autogen" am: 445a5e3836 am: b5b4200ad5 am: c45f268aad -s ours
am skip reason: Change-Id I00efeab1be351a95083f3b6e2dbc9067849bee20 with SHA-1 2ee00fb249 is in history

Change-Id: I4c8d22b9a69667611866015435358993150b524c