Merge remote-tracking branch \'aosp/upstream\' into master
am: b7fa4c57
* commit 'b7fa4c57':
Support dependencies between variants
Add support for dependency tags
Clone all modules between mutators and GenerateBuildActions
Change-Id: I9125b017864c60e73744a0736edea2cee97d766a