Quick fix for the x86 build.

Change-Id: I995882f60ce3163fe639e4d3cd4073f1f6bde8ae
14 files changed