Merge "Work around clang-tidy bug in dex_builder.cc." am: c6036971e7 am: 24a986bfb1
am: acd74cfac0

Change-Id: Id213b483d0439dd03f198552d8ca78831347256a