[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 am: 63571e37 am: 3c86c313 -s ours
am skip reason: Change-Id If4790cb710c35d6fd3d562b3eb4205d1cba24a50 with SHA-1 9d7f160e is in history
Change-Id: If5d7d6b96e2a05f10554eeba29068cfdff04e2d3