Merge "Merge "Temporarily disable clang-tidy for dex_builder.cc." am: 171dfad60c am: e6d84ae4c9 am: 6cb189e322"