[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 am: a28458f1 am: aed58fd9 -s ours am: bfefd277 -s ours

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

Change-Id: I53fcd940f7307d1feb2e86b78d380b575e814d29