NAN: Support multiple instantiation per UID - introduce a client ID. [DO NOT MERGE]

Add the concept of a client ID which is used to identify a specific
(one of several) clients in all API calls.

Bug: 26962024
Change-Id: I43f13d51bee8b57c6d0ba1174168288b8d6c21c5
2 files changed