Merge "Add SocketTagger class to JniConstants" am: b6fe270
am: e87e29b

* commit 'e87e29bea4ae9b445bc726306e3fc4cd19e245eb':
  Add SocketTagger class to JniConstants

Change-Id: I0224f1f76196969c43a9fd49aea56f9fffac6bde