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

Change-Id: Ic53e3297429c22a7cf7eb7e113c52c765834f22e