Update for clang r203213