Change-Id: If6e58db174159111dec9c6ab39258d757a3e6ba5
c16027de84
Also align our configure.in to the changes Change source file (configure.in), not only generated file (configure)