Merge changes I4753cae7,Ic6554d9b

* changes:
  Remove QTagUid_ prefix from function names
  Calling NDK version of tagSocket/untagSocket