Merge "Fix fuchsia build"