b3932817a4
This is trying to fix the GCC build. MFC after: 1 month X-MFC-With: r290663
This is trying to fix the GCC build. MFC after: 1 month X-MFC-With: r290663