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