am 47d620ac: Merge "Ensure access to the map of geofence callbacks is...
am 47d620ac: Merge "Ensure access to the map of geofence callbacks is synchronized in all cases Fix Java reference leak in the JNI layer" into klp-dev
* commit '47d620ac':
Ensure access to the map of geofence callbacks is synchronized in all cases Fix Java reference leak in the JNI layer