am 3711df3c: Merge "Fix full_x86-eng build."

* commit '3711df3c1fbd2d310eb4f742a539913a3b5ce0af':
  Fix full_x86-eng build.