[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 -s ours am: b0e0cc08 -s ours
am skip reason: Change-Id If4790cb710c35d6fd3d562b3eb4205d1cba24a50 with SHA-1 9d7f160e is in history
Change-Id: I1aae9c2ecf1194aab188556ad8cd337d829b4dff