Fixing build flags

Change-Id: I893c834ef9fd34096959f7c8fee1b0acd4980dae