Merge "Work around clang-tidy bug in dex_builder.cc."