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