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 am: b9243e92
Change-Id: If82224c30014cf5d18c556c3fbcaf5713358581b