Revert^2 "Remove dependencies on the 1-variant fallback"

This reverts commit 0e3918593b6434b6e9da3d97761dc29435fa7352.

Reason for revert: Underlying issue fixed in aosp/3315872

Change-Id: Icc779fa4f93adc02d50236fcc17828a013f966e8
3 files changed