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: 2bbbd157 am: 1d3553a6
Change-Id: Iad13e7d8b7852e990b0653b1cd6cce186606aa18