[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 -s ours
am skip reason: Change-Id I33af58f697050c2f63517bddde0194c0b0268db3 with SHA-1 45b761c7 is in history
Change-Id: I2ed749356c6b4d231ded75aa95a0968224084795