Merge "Fix user-build on fugu."