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

Change-Id: Ic5511c4042d6b0bebc2e10392ef7cd854b388079