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

Change-Id: I4762a3d4af935081c5d456ca30daf561fcd312f5