Replace more occurrences of `make` with `m` in ART. am: e47933ab30
am: 3b793cfa6e

Change-Id: Ib70af0cc8d1079a32489b94e850f7ac1e7527017