Use m instead of make. am: 411a6de639 am: 047169f847
am: 2c6104479d

Change-Id: I3a9173d01b08da331b00fced7f59026c780f2eba