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