Merge "Fix generic ramdisk build failures on dedicated recovery partitions"...

Merge "Fix generic ramdisk build failures on dedicated recovery partitions" am: 2797146c am: 621e9cc5

Original change: https://android-review.googlesource.com/c/platform/build/+/2388833



Change-Id: I30ebb7865b2b5e10270fe435347983e424a42ad9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>