Merge "Fix build: Remove -Wold-style-cast"