[automerger skipped] Merge "Fix resolv_gold_test failure problem in MTS." into...

[automerger skipped] Merge "Fix resolv_gold_test failure problem in MTS." into rvc-dev am: d5fb122b am: 09b43036 -s ours am: 54d97bde -s ours am: 1c562fe7 -s ours

am skip reason: Change-Id I0b148535d4e0aa7b272bf2af64fdb4f27f4f7e83 with SHA-1 9ff7d2a0 is in history

Change-Id: Ic2148e45dc0ccd460d48d71bedbe417cdc11736e