Merge "Update makefile to match ARM's convolve patches."