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

* commit '65ddab7c6150a7f86839d046f9f63a9a5cbb220c':
  Fix full_x86-eng build.