Merge "Minor change for jni cts test of asynchronous DNS query API" am: 652fc29761
am: bf375e495d

Change-Id: I1523bb0144719eeb458f9c48ab58e1e89780156e