This is needed to build an independent toolchain with g++ that doesn't think that all these headers are in C. Change-Id: Ie9a8ccfcab7780d6a4e5722777d61c2b1b312001
QA Impact:None Original author: niko Automated import of CL 144391