Merge changes from topic "NDK DNS API CTS" am: 0e45542141
am: 33e10a1a85

Change-Id: Icd14da21de70e2b01c8e39de85bcc60b2948a999