am b39bb80c: Merge "Enable x86 support"

* commit 'b39bb80c4e2160bcb17cb0de1c4bbb9793f783f5':
  Enable x86 support