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

Change-Id: Id1c7360fe4e886369b48c3ffc1c8bdb3ef2b9ee6