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

Change-Id: Ic46821b9512dc4b73ce153202012984a714649c5