New build flags

Change-Id: Ia72df94098bff0952c1f52ea41819b2a00c249f3