these should've been removed with the build cherry-pick for gccfreedom

Change-Id: I199899fef5ca034456c9810990499a83224dd6d9