...similarly to 0fdbb5b0 "Make
cpp_uno/gcc3_linux_x86-64 bridge work with GCC 4.7"

Change-Id: Idcafcb07678d02446172d7fde30631a342f6437e