Merge "Remove modules-utils-build_system from filegroup" into sc-dev am: 9199dbc6 am: 4c0b867d

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

Change-Id: I4a053511864c0b7a780fa4f7de5797b3a52221ad