Merge "Re-enable -Wover-aligned."