Merge "[NAN] Use a hidden class for peer ID opaque handle"
am: e43c1a3e3e

Change-Id: Iac94c4b27f7bfc89c1b1f7779760512ee2a11e31