Merge "Avoid to use make directly" am: f43f5d50e6

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

Change-Id: I2e114dffae4c10a3e26a662f425171e2e168e643