Makefile: further tune flags

Change-Id: Icf15659e83c72664a32f62b3da1015ec2c4e2440