Merge remote-tracking branch 'origin/master'

OsmAnd/AndroidManifest-free.xml

@@ -12,6 +12,11 @@
             tools:replace="android:process"
             android:process="net.osmand"/>
 
+        <service
+            android:name="net.osmand.aidl.OsmandAidlService"
+            tools:replace="android:process"
+            android:process="net.osmand"/>
+
         <provider
             android:name="android.support.v4.content.FileProvider"
             tools:replace="android:authorities"

OsmAnd/AndroidManifest-freedev.xml

@@ -9,6 +9,10 @@
             android:name="net.osmand.plus.NavigationService"
             android:process="net.osmand.dev"
             tools:replace="android:process"/>
+        <service
+            android:name="net.osmand.aidl.OsmandAidlService"
+            tools:replace="android:process"
+            android:process="net.osmand.dev"/>
         <provider
             android:name="android.support.v4.content.FileProvider"
             android:authorities="net.osmand.dev.fileprovider"

OsmAnd/AndroidManifest.xml

@@ -714,7 +714,10 @@
 			</intent-filter>
 		</service>
 
-		<service android:name="net.osmand.aidl.OsmandAidlService" android:exported="true" >
+		<service
+			android:process="net.osmand.plus"
+			android:name="net.osmand.aidl.OsmandAidlService"
+            android:exported="true">
 			<intent-filter>
 				<action android:name="net.osmand.aidl.OsmandAidlService"/>
 				<category android:name="android.intent.category.DEFAULT"/>