Merge "Remove incompatibilities genrules" am: 60f8dee304 am: 92cc90c21f am: c904bda472

Original change: https://android-review.googlesource.com/c/platform/prebuilts/sdk/+/1556050

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I608f0a79b506e5c000c44230f8a6f4e1572a7ff2