Revert spurious compiler flag addition
am: c4c668ed29

Change-Id: I7e84392005da73d03bb919da1d4f354647580153