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