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

Change-Id: I58121fe615a8fd0d0af1d373884d83130026a4df