Update build flags

Change-Id: Ic9a1951a540962c8385ebd31ad3f8f76df63e4b0