Part of the configure is upstreamed, drop those 3 hunks.

Change-Id: I5f2ad217aaba050969cb655091f33fe61970a512