GCC 4.8 cfx

Change-Id: Ie519300a86ae52d4324b0bdf634166b4a076866e