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: cac4d640 am: be4e5474 am: 99a0d5f7 am: 49d7ad09
Change-Id: If0500c857f250b5dc3b8fcde354d35116bdf975f