Merge "Add dependency on modules-utils-build" am: 4c85126591

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

Change-Id: Iefa773a7dc55a2edbcc9142baf62e185d18507de