Fix build break do to  upstream Flags change

Change-Id: Ib3abf71c5bba551e5b136e9dc79b48e54f986d39
3 files changed