Merge "use init functions to register module types, etc." into master-soong