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

Change-Id: I13efd650ad82f46e7c060558809109b72de17047