Fix compilation errors with gcc 4.8

Change-Id: I27b560526c363ef43be0008aa7bca6a5cfd64508
update defconfig

Change-Id: Ib270e7360f18a78d8cc7c2fc1d1d58f58e19b540