Merge "Switch from init to init_system to match base_system.mk"