Merge "Stop system server depending on the stubs of itself" into rvc-dev am:...
Merge "Stop system server depending on the stubs of itself" into rvc-dev am: 91440b92 am: 4dd6f6b4 am: fb7039cf am: 82a64744
Change-Id: Iecc461bf7757d848445bed62ea3a94ad584f8aa5