Merge "Separate out lists of modules from build rules" am: 6b35a8ac47

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671345

Change-Id: I5a6dbacb50c3e7b9a7493124c4c6f8ab005eea3a