Eliminate another two enumerations of all modules. Bug: 169103987 Test: m android_{,system_}stubs_current && diff intermediates (no diffs) Merged-In: I0d35f1e76320356ee4e5535a40614cf7d8ff4486 Change-Id: I0d35f1e76320356ee4e5535a40614cf7d8ff4486