Merge "Remove oat_patches from the DWARF writer."
am: 0dbb3d10c1

Change-Id: I874702aa488fbcf1578b3e6deb53c3027e4d5c14