Merge "[CFI] Remove function pointer casts"