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

Change-Id: I160b117c8112fd02ae4d2288a4eb35c8d5d48ed9