Merge "Merge "Temporarily disable clang-tidy for dex_builder.cc." am: 171dfad6 am: e6d84ae4 am: 6cb189e3"