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

Change-Id: Ibb2773ff0e5977caacd826c1d79eca2e71ac1419