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

* commit 'c4206df9e8b59d1e9e948033e02ec08620f31c8b':
  Fix incorrect x86 build rules.