am 7bb08e50: am 3c02db6d: Merge "Update makefile to match ARM\'s convolve patches."

* commit '7bb08e5073061a3358407737974b1e31fa7e4ae6':
  Update makefile to match ARM's convolve patches.