Merge "Fall back to the source module for variants that the corresponding...
Merge "Fall back to the source module for variants that the corresponding prebuilt doesn't define." am: 1b2bae1b am: 45f0028d
Change-Id: Iccd954c014135ecd1a6e38f44cc5d943b39992fb