Merge "Fix full_x86-eng build."