Merge "[NAN] Replace int peerId with more opaqure Object peerHandle per API review" am: 88da460cd8
am: bc74135d6a

Change-Id: I1368c0bfe18415126924e13eebe30f9061ac5b41