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

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

Change-Id: Icb64b0e63fbe5dcf0d3d2f47ea5666647a3a885b