Merge "Revert "init: Separate the required modules of core and recovery..."" into s-keystone-qcom-dev