Merge "Remove unused arm defines."