Merge "Add genrules for merged system server stubs" into sc-dev