Revert GCC-4.8/4.9 compilation and fix for linano 4.7

Change-Id: I6b15dd2d337b2cb590a03b2c8f8605536fcbaf08