Update flags to match make

Change-Id: I8ba24723d5b507fa178255c124b11356719700cb
6 files changed