Merge "Add flag to enable assertions in Clang"