Merge "JNI: Fix callback obj for Advertisement" am: 53e4c2f08f
am: e4d9714f04

Change-Id: I4cc38c5a47c74bcfff3382f37c7c87528527803f