am 4c3a82fa: am 2863fa7a: Merge "FDO: support linux-x86 target"

* commit '4c3a82fa62f8bfd4b0553cbd21b439ff2502d639':
  FDO: support linux-x86 target