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

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

Change-Id: I5466080426f9c2715c7b836f6bd7269d8414f955