Merge "Early crash of servicemanager shouldn't start apexd"