Merge "Update build files to new compiler filters."