[automerger skipped] Fix the multi arch issue of resolv_unit_test. am:...
[automerger skipped] Fix the multi arch issue of resolv_unit_test. am: 9d7f160e am: 06f483fd -s ours
am skip reason: Change-Id I1ada0895f5d055a67d93a9159c54e6b60fd1402e with SHA-1 6e47d119 is in history
Change-Id: Ib771b94de6f7ec9bed15c9771cd52531082fb001