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

Change-Id: Ic275a05e10c6721b3a1a0dec75d5bdc4699ad5c0