Merge "Update build files for Fluoride on Linux"