Fix build break do to  upstream Flags change
am: e79df16981

Change-Id: If8103b4f28043d6c233e727cc2917789fc9110aa