Merge "Do not add dependencies from disabled sdk variants to its members" am: 1c1c6ab4 am: 63f0e96c am: ad22da0d Change-Id: I729e209bb9c4c67443697bd4d76053d391a1bca5