Merge "Allow multiple native debug entries with same address." am: 7201ef48fb
am: e133c5e431

Change-Id: If6eac1476c8168bd601d1dfbd92689cb6277dbb0