Merge "Add support for non updatable system server stubs" into sc-dev