fix x86 build

Change-Id: I03cfbfeaeb8b13842248856b14b4a23711036e10
11 files changed