[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 -s ours am: da331876 -s ours
am skip reason: Change-Id I0b148535d4e0aa7b272bf2af64fdb4f27f4f7e83 with SHA-1 9ff7d2a0 is in history
Change-Id: Ia9f1df63fb0d660dc694e517945a562c04aca6ab