Fix issues that occurred due to building with clang

Change-Id: I4fb3eb1c8d2a02312deaeebf4a0627153bf8700a
1 file changed