Merge "Add more dwarf debug line info for Optimized methods."