Fix the compilation warnings on x86. Change-Id: Ic9edafc5b33462f5c96faa391e6441141aa09837 CRs-Fixed: 3591586