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

Change-Id: I656c9197b60e26a9d9a7e4b19a9caa3f5a7e949d