Merge remote-tracking branch 'goog/master' into oc-dev

* goog/master:
  Improve error messages when dependency variants are missing

Test: Make an error, see better error message.
Bug: 33241851
Change-Id: I2e7f3387b5707a9059c1970331ca88a062f903c5