Merge "init: Separate the required modules of core and recovery variants" am: 81dad902f6 am: feb6ff1ef9

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1739813

Change-Id: I2b460230b3a5bbcd260bd0ac17bd328bd51f5ca6