Reland: #67155

Fixes analysis error caused by landing of material migration, and g3 error caused by moving of fuchsia lib.