Merge "DO NOT MERGE: Fix full_x86-eng build."