Merge "Fix -O0 builds."