Merge "Add SocketTagger class to JniConstants"
am: b6fe270

* commit 'b6fe27011acca7b4703da2534f4ce502b1fe6a5d':
  Add SocketTagger class to JniConstants

Change-Id: I084745c4ef2c18d7fb49a8a06f1f702f44862f05