Merge "Remove unneeded build declarations in features"