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

Change-Id: I8cfeacb87a448273f29e4d5098926766c2ed43d4