Merge "Part of fix for bug 5065047 build libchromium as a shared lib"