Fixes for gcc 4.9.1 toolchain.

Change-Id: I2b9ad54f5de47d0acfcfde407a3315133ade76b3
2 files changed