Clean up compile flags

Change-Id: I68fd998b931f88cbe7ed633b8d137d1944acefe9