Fix --disable-use-x86inc

Change-Id: I374fcd8fb45a6893dcdeac6896671be142a99f06
8 files changed