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

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

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



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