Merge "Store a copy of MethodDebugInfo in ElfWriter" am: 4d3df9131c
am: d099d86b11

Change-Id: Id1183beef54490237967c4ad6a9abbec44384a18