Merge "Make system_server stubs consistent with other stubs" into rvc-dev am: 10af06b52f am: 0d24f06335 am: 9bc483f20a

Change-Id: Ic778e05ae5e446bcc72e91c24efc9aa6e4550832