[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: 6187c33c -s ours

am skip reason: Change-Id If4790cb710c35d6fd3d562b3eb4205d1cba24a50 with SHA-1 9d7f160e is in history

Change-Id: I2de7249bf53ce6500de7b9c0be327482602d68cd