ref: ff8505a54d0b3dda220f5c0695519c353c82b933
parent: 29a17db9134188f481e8fe5f6955c6d88618acce
author: Johann <johannkoenig@google.com>
date: Mon Jun 29 12:44:30 EDT 2015
Fix --disable-use-x86inc Change-Id: I374fcd8fb45a6893dcdeac6896671be142a99f06