Removing temporary tweaks to make tests pass in presubmit

Now that we have a more reliable build of CF

Bug: 142828227
Change-Id: Ib385443048b6ccd9e1eb3372dc39947536f948bd
2 files changed