Merge "Avoid to use make directly" am: f43f5d50e6 am: 2352705620 am: 796ccfd128

Original change: https://android-review.googlesource.com/c/platform/development/+/1890317

Change-Id: I8c6da21772fe7bd7f7e0dd1dec14870636958806