Merge "Remove unnecessary 10.8-specific build rules"