[automerger skipped] Fix resolv tests symbol missing problem for R MTS on Q...

[automerger skipped] Fix resolv tests symbol missing problem for R MTS on Q devices. am: 92102ff2 am: 3c332844 am: 3eac2487 am: ec7ee1a0 -s ours am: e8aed275 -s ours

am skip reason: Change-Id I33af58f697050c2f63517bddde0194c0b0268db3 with SHA-1 45b761c7 is in history

Change-Id: Ic48b41b1c4485dc41fe26a4988b03541dd2959e3