Merge remote-tracking branch 'upstream/master' into merge

* upstream/master:
  Add support for module variant aliases
  Delay allocating variationMaps until populating them
  Use module groups more widely

Test: TreeHugger
Change-Id: Ic591beac1ec34543ca8c1dfe7bc3ba456e763d7c