Merge "Support building crate variants." am: eb91e5586a am: 6e08106f21

Original change: https://android-review.googlesource.com/c/platform/development/+/2368768

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