Merge "Clean up RS math headers." into honeycomb