Merge "Modification in loc-core and location-api for EAP compilation"