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

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

Change-Id: Iefe31940c72ba1ea88477b9ad51cd07e8c9d447e