Merge "Don't pass LOCAL_CFLAGS when compiling assembly code."