Return funny-smelling CFLAGS to build - turns out they weren't at fault for mako funk

Change-Id: Ibc333c357db9dbb1bbf52ee8b56ae502365fa412