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

Change-Id: I8a8e9ae3e8e8ecc2c0bd8c6ae7cd0abd7d7096c3