[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: e87e734b -s ours am: ab32675f -s ours
am skip reason: Change-Id If4790cb710c35d6fd3d562b3eb4205d1cba24a50 with SHA-1 5e21de3f is in history
Change-Id: Ief6017a08914d1760fb2659955f954071361d504