Merge "Stop system server depending on the stubs of itself" into rvc-dev am: 91440b92 am: cac4d640 Change-Id: Idee222737048b934b45cdfe3941666cf05ffb10a