am 051e28fe: Merge "Fix incorrect x86 build rules."

* commit '051e28fe2128a284ec7987f903f02b9f5826391b':
  Fix incorrect x86 build rules.